Bug Fix: set default query value