Added full OR functionality that can be nested together and used on different fields