Improved searching and ensured that images work better server side