Add InnerJoin filter and entity aliases for all filters

I'll leave this as doctrine-style full-if-statement-with-brackets.