Updated data file and query logic. Fixed bugs

To find more bugs. Next step to format output to JSON.