Design version 2, minor revisions on index + fixed search results