fixed most of the choppyness... tag based searching isn't done