Fixed sorting queries
Started to add accounts