Added support for navigation properties in filter