Added Image gem and fixed search