work on queries
fixed conflict in merge
work on init script