Cells now populate using only one query
Cells now populate using only one query and bugs fixed