services refactoring
added short preview feature