Beta 1.1.1 - Enhance SQL query performance. Clean up code