Query info wasn't indented right
Fixed incorrect scripts listing
Used import from common