Quest optimizer improvements