Remove useless _query property
Merge options instead of overwrite it