Improved Fetch and Added Search