Added ability to use IN and NOT IN in query