Finished DSL parsing, search improvements