added some initial queries for users
fixed some queries