Add any?/none? for query attributes