made filter criteria parser further more efficient. 2