Fixed layout for query results
Merge branch 'master' of https://github.com/danig/eno
Added new query result fields
minor bug fixes for a few files
Merge branch 'master' of https://github.com/danig/eno