DB/Conditions: Fix a couple condition errors and rename 2 sql files