added: query cancellation
fixed: NPEs in navigation