made filter criteria parser more efficient.