Added window location modifiers to the main search function
Dec updates