cleanup
move property to query-params