added entry qery handler - wip