Set edit bugfix + use questions in search