Better handling of page size
better empty string handling