Don't overwrite list templates defined in config
Fix ProxyQuery error on relational identifiers
Merge remote-tracking branch 'soullivaneuh/list-builder-template' into nexylan
Merge remote-tracking branch 'soullivaneuh/relational-identifier' into nexylan