oracle fix and improvements for org. filter queries.