Fixed not querying related models