Add InnerJoin filter and entity aliases for all filters

Don't forget the license block!