Improving layout for searching entities