Add support for general regexp and word boundary searching, bumped number