preparing for adding "AND"/"OR" conditions to where
Added support for "AND"
Handle complex AND/OR Chains