general cleanup, added specific queries for tablets in portrait view