More PHP Notices removed (part 8) + Removed one "repeated" Query