Added much more in-depth boolean filtering for AND/OR