Please improve the and or functionality

Take inspiration from the GA filter functionality