Support $filter and $orderby with ODL parser
Remove trailing whitespace introduced in previous commit