Added hashtag options and updated the database to replace _ with -