BACKLOG-3865 : use properties for query filtering