Update and fixes for recent query modifications.
Update to add parent information in query result
Plugin additions from api modifications