Remove custom query, split out trait for use in edition objects