Huge modification on search UI && API)