Added working upstream custom search