Added advanced possibilities to searching