Filters with OR is not pushed down correctly

As a user if we add multiple filters with "or" operator on spark dataframe it should be enclosed properly with correct brackets but in the current version of hwc multiple filters are not enclosed with proper brackets
for e.g.
df = df.fiter("condition1 or condition2")
df = df.filter("condition3 and condition4")

the resultant query created is as follows

(condition1) or (condition2) and (condition3) and (condition4)
ideally it should be as follows
((condition1) or (condition2)) and ((condition3) and (condition4))