Fixed Tags, added features to search.

Signed-off-by: commandersatisfied <huppel31@hotmail.com>
Merged everything with Rob+Arjen.

Signed-off-by: commandersatisfied <huppel31@hotmail.com>