added more fields
fixed error
added columns
query working fast