Optimizations

Reduced SQL-Code
Improved Browser