Changed structure of entity filters. Implemented all methods.