Revert queries behavior add ||= to beginning