After code review fixes and query enhansement. Refs #278