Modified the Queries that used select *

Instead of using select * which is heavy because it returns everything.
Just query for the fields we are displaying in the table