adding query property handling
reloving conflicts