Fix #70 to allow custom properies from queries