Fixed #82 and working with the query ui components