move alias handler in property query
move logic inside propertyquery
comment